Don't leak old_text. (#153467, Christian Persch)

2004-09-22  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text.
	(#153467, Christian Persch)

diff --git a/ChangeLog b/ChangeLog
index 423893f95e87ecca86603027c6fca1273610715d..02fb2a7ca6cd3e3208f6eabe6d3d57929c23c432 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-09-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text.
+       (#153467, Christian Persch)
+
        * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
        bitops on booleans.
        (gtk_file_chooser_default_should_respond): Make it easier to 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 423893f95e87ecca86603027c6fca1273610715d..02fb2a7ca6cd3e3208f6eabe6d3d57929c23c432 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,8 @@
 2004-09-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text.
+       (#153467, Christian Persch)
+
        * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
        bitops on booleans.
        (gtk_file_chooser_default_should_respond): Make it easier to 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 423893f95e87ecca86603027c6fca1273610715d..02fb2a7ca6cd3e3208f6eabe6d3d57929c23c432 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,8 @@
 2004-09-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text.
+       (#153467, Christian Persch)
+
        * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
        bitops on booleans.
        (gtk_file_chooser_default_should_respond): Make it easier to 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 423893f95e87ecca86603027c6fca1273610715d..02fb2a7ca6cd3e3208f6eabe6d3d57929c23c432 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,8 @@
 2004-09-22  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtktreeview.c (gtk_tree_view_key_press): Don't leak old_text.
+       (#153467, Christian Persch)
+
        * gtk/gtkfilechooserdefault.c (selection_check_foreach_cb): Don't use
        bitops on booleans.
        (gtk_file_chooser_default_should_respond): Make it easier to 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index cabda229076e67ade2b5c15703601d7c596952d2..5220cf110bdb85df646c40cada45f9c969ae971c 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4336,6 +4336,7 @@ gtk_tree_view_key_press (GtkWidget   *widget,
       const char *new_text;
       gboolean retval;
       GdkScreen *screen;
+      gboolean text_modified;
 
       gtk_tree_view_ensure_interactive_directory (tree_view);
 
@@ -4362,10 +4363,11 @@ gtk_tree_view_key_press (GtkWidget   *widget,
        * the text has changed.
        */
       new_text = gtk_entry_get_text (GTK_ENTRY (tree_view->priv->search_entry));
+      text_modified = strcmp (old_text, new_text) != 0;
+      g_free (old_text);
       if (tree_view->priv->imcontext_changed ||    /* we're in a preedit */
-         (retval && strcmp (old_text, new_text))) /* ...or the text was modified */
+         (retval && text_modified))               /* ...or the text was modified */
        {
-         g_free (old_text);
          if (gtk_tree_view_real_start_interactive_search (tree_view, FALSE))
            {
              gtk_widget_grab_focus (GTK_WIDGET (tree_view));